Merge remote-tracking branch 'origin/dev' into dev

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java

@@ -123,19 +123,23 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 maMachine.setCreateBy(SecurityUtils.getUsername());
                 purchaseMacodeInfoMapper.maMachineAdd(maMachine);
 
+                // 标签绑定
                 maLabel.setIsBind("1");
-                maLabel.setLabelCode(maCode);
+                maLabel.setLabelCode(qrCode);
                 maLabel.setMaId(maMachine.getMaId());
                 maLabel.setCreateTime(new Date());
+                maLabel.setLabelType(9L);
                 purchaseMacodeInfoMapper.insertMaMachineLabel(maLabel);
 
                 MaLabelBind maLabelBind = new MaLabelBind();
                 maLabelBind.setStatus("1");
                 maLabelBind.setIsBind("1");
+                maLabelBind.setLabelCode(qrCode);
                 maLabelBind.setMaId(maMachine.getMaId());
-                maLabelBind.setTypeId(maLabelBind.getTypeId());
+                maLabelBind.setTypeId(typeId);
                 maLabelBind.setBindTime(new Date());
                 maLabelBind.setLabelType(9);
+                maLabelBind.setBinder(SecurityUtils.getUserId().toString());
                 purchaseMacodeInfoMapper.insertMaLabelBind(maLabelBind);
 
             }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml

@@ -263,7 +263,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="binder != null">binder,</if>
             <if test="labelType != null">label_type,</if>
             <if test="companyId != null">company_id,</if>
-            <if test="bindTime != null">binder_time,</if>
+            <if test="bindTime != null">bind_time,</if>
             <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -302,7 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPutinDetails" resultType="com.bonus.sgzb.material.domain.PurchaseMacodeInfo">
         select pcd.production_time productionTime,mt.type_name specificationType, mt1.type_name typeName, pmi.ma_code maCode,
                mm.assets_code assetsCode ,pmi.fix_code fixCode,pcd.type_id typeId,pcd.task_id taskId, mt.code specsCode,mt1.code typeCode,
-               if(pmi.ma_code is null, if(pcd.status != 4, 0 , 1), pmi.status) status,mm.qr_code qrCode,
+               if(pmi.ma_code is null, if(pcd.status != 4, 0 , 1), pmi.status) status,mm.qr_code qrCode,mm.ma_id maId,
                if(pmi.ma_code is not null,1,pcd.check_num)  checkNum
         from purchase_check_details pcd
                      left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id