完成关包 通过工单条码拆包的调试 修改扫描内部工单的不能进包的bug

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

@@ -493,7 +493,14 @@ func (impl *PackOrderServiceImplement) ScanBarcode(user *global.User, barcode st
 			_ = session.Rollback()
 			return nil, grmi.NewBusinessError("插入包装单细则失败, error:" + err.Error())
 		}
-
+		if packOrder.PackTypeId == model.PACK_TYPE_INT {
+			_ = session.Commit()
+			result.IsClosed = false
+			result.Message = "扫描完成, 包装单ID:" + currentPackOrder.PackOrder.PackOrderId
+			result.PackOrderId = packOrderId
+			result.MatchTemplateLi = make([]model.PackTemplate, 0)
+			return result, nil
+		}
 	} else {
 		// 如果当前用户存在操作中的未关包的包装单 则进行查询
 		currentPackOrder, err = packOrderDao.SelectOneWithStatus(packOrderId)
@@ -519,10 +526,15 @@ func (impl *PackOrderServiceImplement) ScanBarcode(user *global.User, barcode st
 				_ = session.Rollback()
 				return nil, grmi.NewBusinessError("更新包装单数据失败, error:" + err.Error())
 			}
+			maxPos, err := packLstDAO.GetMaxPost(packOrderId)
+			if err != nil {
+				_ = session.Rollback()
+				return nil, grmi.NewBusinessError("查询包装单子项位置数据失败, error:" + err.Error())
+			}
 			// 写入当前扫描的包装单子项
 			packOrderLst := model.PackOrderItemLst{
 				PackOrderId:   packOrderId,
-				Pos:           1,
+				Pos:           maxPos+1,
 				PartId:        artId,
 				SerialOrderId: barcode,
 				Status:        model.PACK_STATUS_CLOSED,

web/controllers/jit/PackOrder.rest.go

@@ -454,7 +454,7 @@ func RegisterScanBarcode(party router.Party, path string, method func(user *glob
  ******************************************************************************/
 func RegisterClosePackOrder(party router.Party, path string, method func(user *global.User, packOrderId string) error) {
 
-	party.Get(path, func(ctx iris.Context) {
+	party.Post(path, func(ctx iris.Context) {
 		user, ok := jwts.ParseToken(ctx)
 		if !ok {
 			return