添加platenumber和checkcarset字段 同时对预发运单进行carset校验

meta/jit/ShipOrder.meta.go

@@ -31,6 +31,8 @@ var ShipOrder_CloseTime = grmi.NewField("CloseTime", "[JIT_ShipOrder].CloseTime"
 var ShipOrder_Operator = grmi.NewField("Operator", "[JIT_ShipOrder].Operator", "operator", grmi.TypeString)
 var ShipOrder_FormalShipOrderId = grmi.NewField("FormalShipOrderId", "[JIT_ShipOrder].FormalShipOrderId", "formalshiporderid", grmi.TypeString)
 var ShipOrder_SourceId = grmi.NewField("SourceId", "[JIT_ShipOrder].SourceId", "sourceid", grmi.TypeString)
+var ShipOrder_PlateNumber = grmi.NewField("PlateNumber", "[JIT_ShipOrder].PlateNumber", "platenumber", grmi.TypeString)
+var ShipOrder_CheckCarSet = grmi.NewField("CheckCarSet", "[JIT_ShipOrder].CheckCarSet", "checkcarset", grmi.TypeBool)
 var ShipOrder_CtrlPara1 = grmi.NewField("CtrlPara1", "[JIT_ShipOrder].CtrlPara1", "ctrlpara1", grmi.TypeInt)
 var ShipOrder_CtrlPara2 = grmi.NewField("CtrlPara2", "[JIT_ShipOrder].CtrlPara2", "ctrlpara2", grmi.TypeInt)
 var ShipOrder_CtrlStr1 = grmi.NewField("CtrlStr1", "[JIT_ShipOrder].CtrlStr1", "ctrlstr1", grmi.TypeString)
@@ -69,6 +71,8 @@ var ShipOrder = grmi.NewEntity(
 		ShipOrder_Operator.Name:          ShipOrder_Operator,
 		ShipOrder_FormalShipOrderId.Name: ShipOrder_FormalShipOrderId,
 		ShipOrder_SourceId.Name:          ShipOrder_SourceId,
+		ShipOrder_PlateNumber.Name:       ShipOrder_PlateNumber,
+		ShipOrder_CheckCarSet.Name:       ShipOrder_CheckCarSet,
 		ShipOrder_CtrlPara1.Name:         ShipOrder_CtrlPara1,
 		ShipOrder_CtrlPara2.Name:         ShipOrder_CtrlPara2,
 		ShipOrder_CtrlStr1.Name:          ShipOrder_CtrlStr1,
@@ -80,4 +84,4 @@ var ShipOrder = grmi.NewEntity(
 		ShipOrder_CreateTime.Name:        ShipOrder_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"ShipTemplateId", "ProjectId", "ShipType", "OrderInfo", "PrinterId", "TemplateFile", "PlanQty", "ActQty", "OpenTime", "CloseTime", "Operator", "FormalShipOrderId", "SourceId", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})
+	[]string{"ShipTemplateId", "ProjectId", "ShipType", "OrderInfo", "PrinterId", "TemplateFile", "PlanQty", "ActQty", "OpenTime", "CloseTime", "Operator", "FormalShipOrderId", "SourceId", "PlateNumber", "CheckCarSet", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})

models/jit/ShipOrder.model.go

@@ -35,6 +35,8 @@ type ShipOrder struct {
 	Operator           string                     `xorm:"nvarchar(20) 'Operator' not null" json:"JIT_ShipOrder-Operator"`
 	FormalShipOrderId  string                     `xorm:"nvarchar(40) 'FormalShipOrderId'" json:"JIT_ShipOrder-FormalShipOrderId"`
 	SourceId           string                     `xorm:"nvarchar(40) 'SourceId'" json:"JIT_ShipOrder-SourceId"`
+	PlateNumber        string                     `xorm:"nvarchar(40) 'PlateNumber'" json:"JIT_ShipOrder-PlateNumber"`
+	CheckCarSet        bool                       `xorm:"bit 'CheckCarSet' not null" json:"JIT_ShipOrder-CheckCarSet"`
 	CtrlPara1          int                        `xorm:"int 'CtrlPara1' not null" json:"JIT_ShipOrder-CtrlPara1"`
 	CtrlPara2          int                        `xorm:"int 'CtrlPara2' not null" json:"JIT_ShipOrder-CtrlPara2"`
 	CtrlStr1           string                     `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"JIT_ShipOrder-CtrlStr1"`

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

@@ -40,6 +40,8 @@ var DefaultConditionOfShipOrder = grmi.NewCondition(
 		meta.ShipOrder_Operator.UrlParameterName:          grmi.NewConditionItem(meta.ShipOrder_Operator, grmi.Equal, false),
 		meta.ShipOrder_FormalShipOrderId.UrlParameterName: grmi.NewConditionItem(meta.ShipOrder_FormalShipOrderId, grmi.Equal, false),
 		meta.ShipOrder_SourceId.UrlParameterName:          grmi.NewConditionItem(meta.ShipOrder_SourceId, grmi.Equal, false),
+		meta.ShipOrder_PlateNumber.UrlParameterName:       grmi.NewConditionItem(meta.ShipOrder_PlateNumber, grmi.Equal, false),
+		meta.ShipOrder_CheckCarSet.UrlParameterName:       grmi.NewConditionItem(meta.ShipOrder_CheckCarSet, grmi.Equal, false),
 		meta.ShipOrder_CtrlPara1.UrlParameterName:         grmi.NewConditionItem(meta.ShipOrder_CtrlPara1, grmi.Equal, false),
 		meta.ShipOrder_CtrlPara2.UrlParameterName:         grmi.NewConditionItem(meta.ShipOrder_CtrlPara2, grmi.Equal, false),
 		meta.ShipOrder_CtrlStr1.UrlParameterName:          grmi.NewConditionItem(meta.ShipOrder_CtrlStr1, grmi.Equal, false),
@@ -946,6 +948,24 @@ func (impl *ShipOrderServiceImplement) ScanBarCode(user *global.User, barCode st
 		_ = session.Rollback()
 		return nil, grmi.NewBusinessError("更新包装单状态失败, error:" + err.Error())
 	}
+	// 预发运单校验CarSet
+	if shipOrder.ShipOrder.ShipType == model.SHIP_TYPE_ADVANCE && shipOrder.ShipOrderStatus.Status == model.SHIP_STATUS_RUNNING && shipOrder.CheckCarSet {
+		if packOrder.PackTemplateId != "" {
+			shipLstLi, err := shipOrderLstDao.Select([]grmi.Predicate{meta.ShipOrderItemLst_ShipOrderId.NewPredicate(grmi.Equal, shipOrderId)}, []grmi.Field{meta.ShipOrderItemLst_Pos})
+			if err != nil {
+				_ = session.Rollback()
+				return nil, grmi.NewBusinessError("查询发运单子项失败, error:" + err.Error())
+			}
+			if len(shipDataLstLi) != 0 {
+				shipOrderItem := shipLstLi[0]
+				if shipOrderItem.PackTemplateId != "" && packOrder.PackTemplateId != shipOrderItem.PackTemplateId {
+					_ = session.Rollback()
+					return nil, grmi.NewBusinessError("该发运单检测派生，当前扫描的包装单和已进发运单的派生不一致")
+				}
+			}
+		}
+	}
+
 	// 如果是预发运单 且没有使用发运模板 直接添加发运单子项 并记录响应的数量和状态变化
 	if shipOrder.ShipOrder.ShipType == model.SHIP_TYPE_ADVANCE && shipOrder.ShipOrder.ShipTemplateId == "" {
 		shipOrder.ShipOrder.PlanQty += 1
@@ -1615,4 +1635,4 @@ func (impl *ShipOrderServiceImplement) SelectWithStatus(user *global.User, urlPa
 		return nil, err
 	}
 	return result, nil
-}
+}