修改通过发运模板创建的预发运单也可以手动关闭，在翻车时只适配预发运单中已完成的发运子项

services/jit/implments/ShipOrder.service.impl.go

@@ -1878,7 +1878,7 @@ func (impl *ShipOrderServiceImplement) ChangeAdvanceToFormal(user *global.User,
 		return grmi.NewBusinessError("该正式发运单已在操作中, 发运单ID:" + formalShipOrderId)
 	}
 	// 3. 比对两个发运单的子项
-	advanceShipOrderItemLi, err := shipOrderLstDao.Select([]grmi.Predicate{meta.ShipOrderItemLst_ShipOrderId.NewPredicate(grmi.Equal, advanceShipOrderId)}, []grmi.Field{meta.ShipOrderItemLst_Pos})
+	advanceShipOrderItemLi, err := shipOrderLstDao.Select([]grmi.Predicate{meta.ShipOrderItemLst_ShipOrderId.NewPredicate(grmi.Equal, advanceShipOrderId), meta.ShipOrderItemLst_Status.NewPredicate(grmi.Equal, model.SHIP_STATUS_CLOSED)}, []grmi.Field{meta.ShipOrderItemLst_Pos})
 	if err != nil {
 		return grmi.NewBusinessError("查询预发运单子项失败, error:" + err.Error())
 	}
@@ -2012,9 +2012,9 @@ func (impl *ShipOrderServiceImplement) ChangeAdvanceToFormal(user *global.User,
 	return nil
 }
 
-// CloseShipOrder 关闭用户不是通过包装模板创建的预发运单
+// CloseShipOrder 关闭预发运单
 func (impl *ShipOrderServiceImplement) CloseShipOrder(user *global.User, shipOrderId string) error {
-	grmi.Log(user, "/services/jit/implments/ShipOrder.service.impl.go", "CloseShipOrder", "关闭用户不是通过包装模板创建的预发运单")
+	grmi.Log(user, "/services/jit/implments/ShipOrder.service.impl.go", "CloseShipOrder", "关闭预发运单")
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
@@ -2032,9 +2032,9 @@ func (impl *ShipOrderServiceImplement) CloseShipOrder(user *global.User, shipOrd
 	if shipOrderData.ShipOrder.ShipType != model.SHIP_TYPE_ADVANCE {
 		return grmi.NewBusinessError("该发运单不是预发运单，不允许关闭")
 	}
-	if shipOrderData.ShipOrder.ShipTemplateId != "" {
-		return grmi.NewBusinessError("该发运单已经绑定包装模板, 不允许关闭")
-	}
+	//if shipOrderData.ShipOrder.ShipTemplateId != "" {
+	//	return grmi.NewBusinessError("该发运单已经绑定包装模板, 不允许关闭")
+	//}
 	if shipOrderData.ShipOrderStatus.Status == model.SHIP_STATUS_CLOSED {
 		return grmi.NewBusinessError("该发运单已经完成关闭, 不能再次操作")
 	}